Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

World Icons #2279

Merged
merged 15 commits into from
May 31, 2024
Merged

Conversation

Sun-Soaked
Copy link
Contributor

@Sun-Soaked Sun-Soaked commented Aug 12, 2023

About The Pull Request

Ports world icons from Mojave 13.
This is an element that allows for tiny, size-accurate versions of object sprites in a roundabout way.

Drafted since spritainers want more coverage before merging
UNDRAFTED by request of a spritainer. God weeps

//MAKING A SUPER BASIC WORLD ICON IMPLEMENTATION GUIDE: FOR REAL. NO VIRUS. 100% ORGANIC//

  • Place the Element in an Init below The Item In Question

/obj/item/Initialize()
. = ..()
AddElement(/datum/element/world_icon, null, icon, 'icon')

  • Fill in info. Put the ORIGINAL ICON in the addelement's 'icon' slot
    (yeah, this element layers the "original" sprite on top of the worldicon one, using it as the default. It just be like that sometimes)

/obj/item/kitchen/knife/combat/Initialize()
. = ..()
AddElement(/datum/element/world_icon, null, icon, 'icons/obj/kitchen.dmi')

  • Put the directory to your NEW, WORLD ICON in the item's normal icon var
    icon = 'icons/obj/world/melee.dmi'

The world icon and icon adjustment vars on obj/item should allow for implementation in places where an object's Icon has to frequently change.

Why It's Good For The Game

Just a little guy

Changelog

🆑
add: World icon element.
add: World icons for combat knives.
/:cl:

world icons
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Aug 12, 2023
@Sun-Soaked
Copy link
Contributor Author

fuck you linters

@thgvr
Copy link
Member

thgvr commented Oct 29, 2023

: D

@Sun-Soaked
Copy link
Contributor Author

: D

I mean it works!
The stuff that we went over in dev is uh

-Spritainers want more sprites done before it's formally implemented in

-Tmt had some issues with the implementation, which is a little odd because it comes from a server trying to have code parity with /TG/
IMO it's better to Have It and then rework it later than wait, but it's their call

@Sun-Soaked Sun-Soaked marked this pull request as ready for review November 13, 2023 22:52
@Sun-Soaked Sun-Soaked requested a review from a team as a code owner November 13, 2023 22:52
@tmtmtl30
Copy link
Contributor

tmtmtl30 commented Nov 15, 2023

sorry for not looking at this in very long. the reason i have issues with the implementation is that it looks like it's implemented to minimize the # of lines you have to modify in an item's original file to add world sprites (why make it an element attached to the item instead of just base behavior on /obj/item?). that makes sense for a server that's trying to maintain parity with an upstream, but less so for us.

regardless, so long as it's functional (and doesn't break when things get blood on them), i'm fine with it

@Sun-Soaked Sun-Soaked marked this pull request as draft November 17, 2023 16:20
@Sun-Soaked
Copy link
Contributor Author

ouaagh(mojave why.. .)

@thgvr
Copy link
Member

thgvr commented Feb 4, 2024

Any luck with the overlay stuff?

@Sun-Soaked
Copy link
Contributor Author

overlays now working, but at what cost? (don't look at the bottom of blood.dm)

@Sun-Soaked Sun-Soaked marked this pull request as ready for review April 11, 2024 02:11
@thgvr thgvr added the Test Merge Required They'll have to do it for free. label Apr 11, 2024
@FalloutFalcon
Copy link
Contributor

Pretty sure this just caused a bunch of items to randomly have no lighting and be on a really high sprite layer

@rye-rice rye-rice added this pull request to the merge queue May 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2024
@rye-rice rye-rice added this pull request to the merge queue May 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2024
@rye-rice rye-rice added this pull request to the merge queue May 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 15, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com>
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 18, 2024
@FalloutFalcon FalloutFalcon added Test Merged They've done it for free. and removed Test Merge Required They'll have to do it for free. labels May 24, 2024
@FalloutFalcon FalloutFalcon added this pull request to the merge queue May 31, 2024
Merged via the queue into shiptest-ss13:master with commit 084eae0 May 31, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jun 1, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Ports world icons from Mojave 13.
This is an element that allows for tiny, size-accurate versions of
object sprites in a roundabout way.

~~Drafted since spritainers want more coverage before merging~~
UNDRAFTED by request of a spritainer. God weeps


### //MAKING A SUPER BASIC WORLD ICON IMPLEMENTATION GUIDE: FOR REAL. NO
VIRUS. 100% ORGANIC//

- Place the Element in an Init below The Item In Question

`/obj/item/Initialize()`
`	. = ..()`
`	AddElement(/datum/element/world_icon, null, icon, 'icon')`

- Fill in info. Put the ORIGINAL ICON in the addelement's `'icon'` slot
(yeah, this element layers the "original" sprite on top of the worldicon
one, using it as the default. It just be like that sometimes)

`/obj/item/kitchen/knife/combat/Initialize()`
`	. = ..()`
` AddElement(/datum/element/world_icon, null, icon,
'icons/obj/kitchen.dmi')`
	
- Put the directory to your NEW, WORLD ICON in the item's normal icon
var
	`icon = 'icons/obj/world/melee.dmi'`	

The world icon and icon adjustment vars on obj/item should allow for
implementation in places where an object's Icon has to frequently
change.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Just a little guy
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: World icon element.
add: World icons for combat knives.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com>
Co-authored-by: Sun-Soaked <45698967+MemedHams@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Sprites A bikeshed full of soulless bikes. Test Merged They've done it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants